Don't clobber the perfectly lovely zip created by mingw/Makefile with

ours that's missing pieces from the tip.  (Sigh.)

diff --git a/gpsbabel/Makefile b/gpsbabel/Makefile
index 40eb1dbe172410626c881933a4494bcdeaa21ed8..4830cf647eb0fb99145c29556edfe431fd570416 100644 (file)
--- a/gpsbabel/Makefile
+++ b/gpsbabel/Makefile
@@ -78,8 +78,8 @@ dep:
        (echo -n "internal_styles.c: mkstyle.sh " ; echo style/*.style ; /bin/echo -e '\t./mkstyle.sh > $@ || (rm -f $@ ; exit 1)' ) >> /tmp/dep
        echo Edit Makefile and bring in /tmp/dep
 
-VERSIONU=1_2_1_beta12132003
-VERSIOND=1.2.1_beta12132003
+VERSIONU=1_2_1_beta01072004
+VERSIOND=1.2.1_beta01072004
 #VERSIONU=1_2_1
 #VERSIOND=1.2.1
 
@@ -91,7 +91,7 @@ release:
        tar czf /tmp/gpsbabel-$(VERSIOND).tar.gz gpsbabel-$(VERSIOND)
        cd /tmp ; tar xzf gpsbabel-$(VERSIOND).tar.gz
        touch /tmp/gpsbabel-$(VERSIOND)/internal_styles.c
-       cd /tmp/gpsbabel-$(VERSIOND)/mingw ; make  && zip -j gpsbabel-$(VERSIOND).zip  gpsbabel.exe libexpat.dll ../win32/gpsbabelfront.exe && cp gpsbabel-$(VERSIOND).zip /tmp
+       cd /tmp/gpsbabel-$(VERSIOND)/mingw ; make
        curl -u anonymous:anonymous --upload-file /tmp/gpsbabel-$(VERSIOND).tar.gz ftp://upload.sf.net/incoming/
        curl -u anonymous:anonymous --upload-file /tmp/gpsbabel-$(VERSIOND).zip ftp://upload.sf.net/incoming/
 

diff --git a/gpsbabel/mingw/Makefile b/gpsbabel/mingw/Makefile
index 469c75f300ec61889bcbd1fdf292e84bc9d202fc..c123048395208dc178bca868c98adab394828c46 100644 (file)
--- a/gpsbabel/mingw/Makefile
+++ b/gpsbabel/mingw/Makefile
@@ -10,8 +10,8 @@ CFLAGS=-Iinclude -I../coldsync -O
 
 gpsbabel.exe: $(OBJS)
        $(CC) -static $(CFLAGS) $(OBJS) lib/libexpat.a -o gpsbabel.exe 
-       cp gpsbabel.exe /tmp
        zip -j /tmp/gpsbabel-$(VERSIOND).zip $(FILES)
+       cp gpsbabel.exe gpsbabel-$(VERSIOND).zip /tmp
 
 mkwintesto: mkwintesto.c
        /usr/bin/cc mkwintesto.c ../util.c -o mkwintesto